[IA64] Fixed "Oops: time tick before it's due" issue

This patch fixed following issue,
"Oops: time tick before it's due" in VTI-domain

Signed-off-by: Anthony Xu <anthony.xu@intel.com>

diff --git a/xen/arch/ia64/vmx/vlsapic.c b/xen/arch/ia64/vmx/vlsapic.c
index 2e4a3218af68a7b4d5432917e86b1a30a24fa7a6..a66e80c99c6c6e5d5e4bec3a2671cdcd8aa5a377 100644 (file)
--- a/xen/arch/ia64/vmx/vlsapic.c
+++ b/xen/arch/ia64/vmx/vlsapic.c
@@ -121,7 +121,7 @@ void vtm_init(VCPU *vcpu)
     itc_freq = local_cpu_data->itc_freq;
     vtm->cfg_max_jump=itc_freq*MAX_JUMP_STEP/1000;
     vtm->cfg_min_grun=itc_freq*MIN_GUEST_RUNNING_TIME/1000;
-    init_timer(&vtm->vtm_timer, vtm_timer_fn, vcpu, 0);
+    init_timer(&vtm->vtm_timer, vtm_timer_fn, vcpu, vcpu->processor);
     vtm_reset(vcpu);
 }
 

diff --git a/xen/arch/ia64/xen/xentime.c b/xen/arch/ia64/xen/xentime.c
index 96a5ca183d2afe30e62a5a20014c884c170de2f4..5d83bf80d05b7e46686f6d3dadc39484559408df 100644 (file)
--- a/xen/arch/ia64/xen/xentime.c
+++ b/xen/arch/ia64/xen/xentime.c
@@ -146,9 +146,9 @@ xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
                         * another CPU. We need to avoid to SMP race by acquiring the
                         * xtime_lock.
                         */
-#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
+//#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
                        write_seqlock(&xtime_lock);
-#endif
+//#endif
 #ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
                        do_timer(regs);
 #endif
@@ -159,9 +159,9 @@ xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
                        itc_at_irq = ia64_get_itc();
                        stime_irq += cycle_to_ns(itc_at_irq - old_itc);
 
-#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
+//#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
                        write_sequnlock(&xtime_lock);
-#endif
+//#endif
                } else
                        local_cpu_data->itm_next = new_itm;